Autogenerated HTML docs for v1.6.5.2-215-g77097f
diff --git a/git-merge.html b/git-merge.html index 28847dd..cbfcd6a 100644 --- a/git-merge.html +++ b/git-merge.html
@@ -624,7 +624,7 @@ Controls which merge resolution program is used by <a href="git-mergetool.html">git-mergetool(1)</a>. Valid built-in values are: "kdiff3", "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", - "diffuse", "ecmerge", "tortoisemerge", "araxis", and + "diffuse", "ecmerge", "tortoisemerge", "p4merge", "araxis" and "opendiff". Any other value is treated is custom merge tool and there must be a corresponding mergetool.<tool>.cmd option. </p> @@ -954,7 +954,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-11-15 09:57:13 UTC +Last updated 2009-11-16 02:10:12 UTC </div> </div> </body>
